auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 08:00:58 +0000 (09:00 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 08:00:58 +0000 (09:00 +0100)

Trivial merge